rules: use new link-arg option (rustc >= 1.13)

diff --git a/debian/changelog b/debian/changelog
index db3c622985074ac610fb482555ccfd88dad8a8da..1282bf8ba407b256108dae531d8aa27626ccc65e 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,9 @@
 cargo (0.15.0~dev-1) UNRELEASED; urgency=medium
 
   * New upstream snapshot (git 1877f59d6b2cb057f7ef6c6b34b926fd96a683c1)
-    - Build with OpenSSL 1.1.0 (Closes: #828259)
+    - Compatible with OpenSSL 1.1.0 (Closes: #828259)
+  * rules: use new link-arg options (Closes: #834980, #837433)
+    - Requires rustc >= 1.13
 
  -- Luca Bruno <lucab@debian.org>  Fri, 25 Nov 2016 23:30:03 +0000
 

diff --git a/debian/control b/debian/control
index 6ffadf373fc173f5a0c2d5a521a94ae103f77d51..8d9c60816d2cebddc63d0cdaab13fbfe316916b0 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,7 @@ Uploaders: Luca Bruno <lucab@debian.org>,
 Priority: extra
 Build-Depends: debhelper (>= 9.20141010),
                dpkg-dev (>= 1.17.14),
-               rustc (>= 1.1),
+               rustc (>= 1.13),
                curl,
                pkg-config,
                cmake,
@@ -21,7 +21,7 @@ Build-Depends: debhelper (>= 9.20141010),
                libssh2-1-dev,
                libgit2-dev,
                libhttp-parser-dev,
-               libssl-dev,
+               libssl1.0-dev,
                zlib1g-dev
 Homepage: https://crates.io/
 Standards-Version: 3.9.8

diff --git a/debian/rules b/debian/rules
index 841ce7c88b8ff0945a944a7a9441a8fda085a989..f42a32132376c437847bfac62deaed661a56c03c 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -3,7 +3,7 @@
 include /usr/share/dpkg/pkg-info.mk
 include /usr/share/dpkg/architecture.mk
 include /usr/share/dpkg/buildflags.mk
-RUSTFLAGS = -C link-args=$(LDFLAGS)
+RUSTFLAGS += $(foreach flag,$(LDFLAGS),-C link-arg=$(flag))
 export CFLAGS CXXFLAGS CPPFLAGS LDFLAGS RUSTFLAGS
 
 rust_cpu = $(subst i586,i686,$(1))
@@ -55,7 +55,7 @@ endif
                --disable-debug \
                --enable-optimize \
                --local-rust-root=/usr \
-               --local-cargo=$(CURDIR)/cargo-stage0
+               --cargo=$(CURDIR)/cargo-stage0
        # Build final cargo binary and docs
        $(MAKE)
 ifeq (,$(findstring nodoc,$(DEB_BUILD_PROFILES)))